-
Notifications
You must be signed in to change notification settings - Fork 198
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
src/libpriv: Add kernel-install-integration #5209
Conversation
1266d45
to
dcbd66f
Compare
draft because I am not sure if this is actually works, still need to test. |
So the simplest thing would be do this as part of A bit more conservative change would be for us to inject it at postprocess time (hence it only gets injected into ostree systems). But I'd lean towards the former, and just sanity check that our no-op is working. |
f7e8eed
to
2d57d19
Compare
2d57d19
to
3108da6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible the spec file needs adjustment, but hopefully not
This breaks kernel-install somehow... I would have expected that the dropin would not get triggered.
I need to dig. |
3108da6
to
d68f32f
Compare
It looks like maybe the problem is that the old kernel dir is sticking around... we might be skipping the cleanup for some reason and in my local test I had the DNF config to keep one kernel. re-testing without that. |
@@ -241,6 +241,7 @@ $PYTHON autofiles.py > files \ | |||
'%{_datadir}/dbus-1/system.d/*' \ | |||
'%{_sysconfdir}/rpm-ostreed.conf' \ | |||
'%{_prefix}/lib/systemd/system/*' \ | |||
'%{_prefix}/lib/kernel/install.d/*' \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like this is wrong:
[2025-01-10T22:15:10.770Z] error: Installed (but unpackaged) file(s) found:
[2025-01-10T22:15:10.770Z] /lib/kernel/install.d/05-rpmostree.install
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's because it was installed to /lib
, not /usr/lib
(it's a symlink in the real system, but not in the RPM). IMO we should always prefer writing to /usr/lib
so change the Makefile.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure why this resolves the container build failing and I double checked and the file is in the correct place. Will do more manual testing before merging this. Because is weird that now even the container-integration tests has no issue removing the old kernel.
d68f32f
to
223f3df
Compare
This is part of the kernel-install integration work done in: https://gitlab.com/fedora/bootc/base-images/-/merge_requests/62 coreos#5135 containers/bootc#1018
223f3df
to
7ab70a9
Compare
This is part of the kernel-install integration work done in: